From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 4 Sep 2011 18:55:40 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~33
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6180fe345cd7edbbab214e7a353c5546c4a5e95d;p=emacs.git

Merge from trunk.
---

6180fe345cd7edbbab214e7a353c5546c4a5e95d